Merge remote-tracking branch 'origin/master' into feature/android

author Po Lu <luangruo@yahoo.com>

Mon, 20 Mar 2023 06:48:13 +0000 (14:48 +0800)

committer Po Lu <luangruo@yahoo.com>

Mon, 20 Mar 2023 06:48:13 +0000 (14:48 +0800)
author Po Lu <luangruo@yahoo.com>
Mon, 20 Mar 2023 06:48:13 +0000 (14:48 +0800)
committer Po Lu <luangruo@yahoo.com>
Mon, 20 Mar 2023 06:48:13 +0000 (14:48 +0800)
diff --cc configure.ac
Simple merge
diff --cc etc/NEWS
Simple merge
diff --cc lisp/frame.el
Simple merge
diff --cc lisp/htmlfontify.el
Simple merge
diff --cc lisp/subr.el
Simple merge
diff --cc src/keyboard.c
Simple merge
author	Po Lu <luangruo@yahoo.com>
	Mon, 20 Mar 2023 06:48:13 +0000 (14:48 +0800)
committer	Po Lu <luangruo@yahoo.com>
	Mon, 20 Mar 2023 06:48:13 +0000 (14:48 +0800)
		1	2
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history
etc/NEWS	patch \|	diff1 \|	diff2 \|	blob \| history
lisp/frame.el	patch \|	diff1 \|	diff2 \|	blob \| history
lisp/htmlfontify.el	patch \|	diff1 \|	diff2 \|	blob \| history
lisp/subr.el	patch \|	diff1 \|	diff2 \|	blob \| history
src/keyboard.c	patch \|	diff1 \|	diff2 \|	blob \| history